Fix gdk_rectangle_union calls

Turns out that the destination is the last parameter, not the first one.
This fixes the flickering in the first page of the widget-factory when
using the expander on page 2.

diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index d2fa3f809548446df3c5693e2073bedefdfc3952..9d55191783c9821d07de08c4fffcdd4f317d4c43 100644 (file)
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -710,7 +710,7 @@ gtk_box_size_allocate_no_center (GtkWidget           *widget,
            }
          gtk_widget_size_allocate_with_baseline (child->widget, &child_allocation, baseline);
           gtk_widget_get_clip (child->widget, &clip);
-          gdk_rectangle_union (out_clip, out_clip, &clip);
+          gdk_rectangle_union (&clip, out_clip, out_clip);
 
          i++;
        }

diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 1011d0054092b0c6d23203aaa294687aa759a06d..fc4381c9f055bd642d7777b1c4fac325401a2c35 100644 (file)
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -745,7 +745,7 @@ gtk_frame_allocate (GtkCssGadget        *gadget,
 
       gtk_widget_size_allocate (priv->label_widget, &priv->label_allocation);
       gtk_widget_get_clip (priv->label_widget, &clip);
-      gdk_rectangle_union (out_clip, out_clip, &clip);
+      gdk_rectangle_union (&clip, out_clip, out_clip);
     }
 
   child = gtk_bin_get_child (GTK_BIN (widget));
@@ -753,7 +753,7 @@ gtk_frame_allocate (GtkCssGadget        *gadget,
     {
       gtk_widget_size_allocate (child, &priv->child_allocation);
       gtk_widget_get_clip (child, &clip);
-      gdk_rectangle_union (out_clip, out_clip, &clip);
+      gdk_rectangle_union (&clip, out_clip, out_clip);
     }
 }
 

diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index e1a944673a393ffce77a31364f3a92f830d83ec1..66899650e6c9eff2c206a5be6f96247d0e73dae5 100644 (file)
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1603,7 +1603,7 @@ gtk_grid_request_allocate_children (GtkGridRequest      *request,
 
       gtk_widget_size_allocate_with_baseline (child->widget, &child_allocation, baseline);
       gtk_widget_get_clip (child->widget, &child_clip);
-      gdk_rectangle_union (out_clip, out_clip, &child_clip);
+      gdk_rectangle_union (&child_clip, out_clip, out_clip);
     }
 }
 

diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
index bd4a399c1db1656a694936e956da7d978ac03868..b9dd5f60c965c8f344ffa2f46ffab67cb4667127 100644 (file)
--- a/gtk/gtklistbox.c
+++ b/gtk/gtklistbox.c
@@ -2793,7 +2793,7 @@ gtk_list_box_allocate (GtkCssGadget        *gadget,
       header_allocation.y = child_allocation.y;
       gtk_widget_size_allocate (priv->placeholder, &header_allocation);
       gtk_widget_get_clip (priv->placeholder, &clip);
-      gdk_rectangle_union (out_clip, out_clip, &clip);
+      gdk_rectangle_union (&clip, out_clip, out_clip);
       child_allocation.y += child_min;
     }
 
@@ -2818,7 +2818,7 @@ gtk_list_box_allocate (GtkCssGadget        *gadget,
           header_allocation.y = child_allocation.y;
           gtk_widget_size_allocate (ROW_PRIV (row)->header, &header_allocation);
           gtk_widget_get_clip (ROW_PRIV (row)->header, &clip);
-          gdk_rectangle_union (out_clip, out_clip, &clip);
+          gdk_rectangle_union (&clip, out_clip, out_clip);
           child_allocation.y += child_min;
         }
 
@@ -2832,7 +2832,7 @@ gtk_list_box_allocate (GtkCssGadget        *gadget,
       ROW_PRIV (row)->height = child_allocation.height;
       gtk_widget_size_allocate (GTK_WIDGET (row), &child_allocation);
       gtk_widget_get_clip (GTK_WIDGET (row), &clip);
-      gdk_rectangle_union (out_clip, out_clip, &clip);
+      gdk_rectangle_union (&clip, out_clip, out_clip);
       child_allocation.y += child_min;
     }
 }